[HVM] Allow blkfront driver to be built for an HVM guest.

Signed-off-by: Steven Smith <ssmith@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
index 20e5ad63b8d324b76a6d5a16824a232190d49523..bee1da5ff5367367625d1b0dc356f7096b8c4fcf 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -46,6 +46,7 @@
 #include <xen/interface/grant_table.h>
 #include <xen/gnttab.h>
 #include <asm/hypervisor.h>
+#include <asm/maddr.h>
 
 #define BLKIF_STATE_DISCONNECTED 0
 #define BLKIF_STATE_CONNECTED    1

diff --git a/unmodified_drivers/linux-2.6/Makefile b/unmodified_drivers/linux-2.6/Makefile
index a7a52f8f9ed8840d3ac914f147eb33e657d69932..dacbc7012f78d8218c623be241b9444a565d4303 100644 (file)
--- a/unmodified_drivers/linux-2.6/Makefile
+++ b/unmodified_drivers/linux-2.6/Makefile
@@ -2,3 +2,4 @@ include $(M)/overrides.mk
 
 obj-m += platform-pci/
 obj-m += xenbus/
+obj-m += blkfront/

diff --git a/unmodified_drivers/linux-2.6/blkfront/Kbuild b/unmodified_drivers/linux-2.6/blkfront/Kbuild
new file mode 100644 (file)
index 0000000..0a46fb2
--- /dev/null
+++ b/unmodified_drivers/linux-2.6/blkfront/Kbuild
@@ -0,0 +1,5 @@
+include $(M)/overrides.mk
+
+obj-m += xen-vbd.o
+
+xen-vbd-objs := blkfront.o vbd.o